Merge pull request #1350 from sfackler/master
authorAlex Crichton <alex@alexcrichton.com>
Wed, 25 Feb 2015 04:32:06 +0000 (20:32 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 25 Feb 2015 04:32:06 +0000 (20:32 -0800)
Don't time out after 0.006 seconds


Trivial merge